Fix AXI4 to AHB converter issues #141
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -345,8 +354,8 @@ import el2_pkg::*; | |||
| end | |||
| DATA_WR: begin | |||
| buf_state_en = (cmd_doneQ & ahb_hready_q) | ahb_hresp_q; | |||
| master_ready = buf_state_en & ~ahb_hresp_q & slave_ready; // Ready to accept new command if current command done and no error | |||
| buf_nxtstate = (ahb_hresp_q | ~slave_ready) ? DONE : | |||
| master_ready = buf_state_en & ~ahb_hresp_q & axi_bready; // Ready to accept new command if current command done and no error | |||
There was a problem hiding this comment.
Line length exceeds max: 100; is: 144 [Style: line-length] [line-length]
| @@ -403,7 +422,7 @@ import el2_pkg::*; | |||
| assign slave_valid = slave_valid_pre;// & (~slvbuf_posted_write | slvbuf_error); | |||
| assign slave_opc[3:2] = slvbuf_write ? 2'b11 : 2'b00; | |||
| assign slave_opc[1:0] = {2{slvbuf_error}} & 2'b10; | |||
| assign slave_rdata[63:0] = slvbuf_error ? {2{last_bus_addr[31:0]}} : ((buf_state == DONE) ? buf_data[63:0] : ahb_hrdata_q[63:0]); | |||
| assign slave_rdata[63:0] = slvbuf_error ? {2{last_bus_addr[31:0]}} : ((buf_state == DONE_RD) ? buf_data[63:0] : ahb_hrdata_q[63:0]); | |||
There was a problem hiding this comment.
Line length exceeds max: 100; is: 138 [Style: line-length] [line-length]
Internal-Tag: [#49716] Signed-off-by: Maciej Kurc <[email protected]>
Internal-Tag: [#49716] Signed-off-by: Maciej Kurc <[email protected]>
Internal-Tag: [#49716] Signed-off-by: Maciej Kurc <[email protected]>
…eter. Internal-Tag: [#49716] Signed-off-by: Maciej Kurc <[email protected]>
Internal-Tag: [#49716] Signed-off-by: Maciej Kurc <[email protected]>
Internal-Tag: [#49716] Signed-off-by: Maciej Kurc <[email protected]>
mkurc-ant
force-pushed
the
mkurc/fix-axi2ahb
branch
from
00f3765 to
7b1e946
Compare
|
Links to coverage and verification reports for this PR (#141) are available at https://chipsalliance.github.io/Cores-VeeR-EL2/ |
|
LGTM |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes incorrect operation of
axi4_to_ahbconverter module wherervalidandbvaliddepend onrreadyandbreadyrespectively which is forbidden by the spec.Microarchitectural tests are updated to exercise correct AXI channel handshaking. A VeeR configuration with AHB bus where the
axi4_to_ahbmodule is used is added to CI regression tests.